Merge branch 'master' of https://github.com/rust-lang/cargo into fix-example-metadata
authorKalita Alexey <kalita.alexey@outlook.com>
Sat, 11 Feb 2017 08:21:50 +0000 (11:21 +0300)
committerKalita Alexey <kalita.alexey@outlook.com>
Sat, 11 Feb 2017 08:21:50 +0000 (11:21 +0300)
1  2 
src/cargo/core/manifest.rs

Simple merge